Merge "Set the AOSP master to be API level 16"