[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 4b307d4c44  -s ours
am: 183f9638d5  -s ours

Change-Id: I4829e4069babf40683d0e09a315c35fdc3bc7881
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