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

Bug: 120848293
Change-Id: Ic51faa360cec7e42c0450bfc320dc4322708b3f5
tree: d179b0ab3dcdafdd9c71bd954030f567003c0781
  1. pppd/
  2. Android.bp
  3. CleanSpec.mk
  4. OWNERS
  5. README.version