am 48a3a78e: (-s ours) Merge "DO NOT MERGE ANYWHERE - Add SDK 23." into stage-aosp-master

* commit '48a3a78efcedc1c4426df23a2dd2e26ede02eee0':
  DO NOT MERGE ANYWHERE - Add SDK 23.