Merge Android R

Bug: 168057903
Merged-In: I64d2be5b9eba48e8269a898a585037e94a6b18e9
Change-Id: I695b1f98565cfe04b895d36b348c6ec2ffaf37f3
tree: de8eb078a0074d3f7b16aeab032338e98e31a661
  1. library/
  2. OWNERS
  3. PREUPLOAD.cfg