[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 1a94b45838 -s ours
am skip reason: subject contains skip directive

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