Merge "set SDK level to eliminate warnings on modules using it" am: ef61449147 am: 7e05180018 am: a2710c5ea7  -s ours
am: da3f936a71  -s ours

Change-Id: I8d5680f79e59fa93ae1fc666ba59927b37684b08