[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: e162f429da  -s ours

Change-Id: Id01273b122e879462b1432e7a2cb09a208c9722d
tree: 506b6ac5543c8381112c530bb5d282b3a02c1d1a
  1. Android.bp
  2. l2tp.c
  3. MODULE_LICENSE_APACHE2
  4. mtpd.c
  5. mtpd.h
  6. mtpd.rc
  7. NOTICE
  8. pptp.c