am 4eddad55: Merge "Set the AOSP master to be API level 16"

* commit '4eddad550ee81edba01734bf378612ed18841751':
  Set the AOSP master to be API level 16