merge from open-source master
tree: cadd4d0da07cd39e979e656edc4f6a90c70764a7
  1. Android.mk
  2. l2tp.c
  3. MODULE_LICENSE_APACHE2
  4. mtpd.c
  5. mtpd.h
  6. NOTICE
  7. pptp.c