DO NOT MERGE: resync to AOSP

mirror-aosp-master and stage-aosp-master should be identical,
but they're not. Pull all missing changes from AOSP into
stage.

Bug: 18224704
Change-Id: Ibe42d00fa1c0b0f81e6c9a3becca338989d6eabc
27 files changed