Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: Idab082b4097e4b1f0ddd55645674fa81746751d9
tree: 260e1b00c5d367d83d9567a801622f4fe518361e
  1. apex/
  2. app/
  3. system-server/
  4. util/
  5. OWNERS
  6. PREUPLOAD.cfg