DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I63d82805e4139bc5e0869cbfef82dc3994311925
tree: 29a5730664b32721366e90f2a3e066666342a20f
  1. Android.bp
  2. OWNERS
  3. src/