merge from open-source master

Change-Id: I8c23f6f2bf984f794758ec27700d5fed4548ac09
tree: f9531885fbcc8b8f8304bab9ccdf2a0b892ad78f
  1. android/
  2. pppd/
  3. CleanSpec.mk