am 1196c824: am 7159a992: am 4eddad55: Merge "Set the AOSP master to be API level 16"

* commit '1196c82491e29eed257a44aa7384d8b836657b82':
  Set the AOSP master to be API level 16