Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 4edad3bb73

Change-Id: I744674e0cd4420ae8cd48b3620dc67bd68b03ea0
tree: 03c8c05c7b3a94cd04a62f691af3a4dc6aa59235
  1. OWNERS
  2. PREUPLOAD.cfg
  3. library/