Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: Ia170335a968f958b746953aa54723ceadece2acd
tree: 1a3be60512ea00d2ee2bb68501b637140d7cc686
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS