Merge "set SDK level to eliminate warnings on modules using it" am: ef614491 am: 7e051800 am: a2710c5e -s ours am: da3f936a -s ours Change-Id: I8d5680f79e59fa93ae1fc666ba59927b37684b08