Merge "DO NOT MERGE ANYWHERE - Add SDK 23." into stage-aosp-master