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

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