Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

Change-Id: Ief0df39bd7ff892ac2719fb8fde50f927022f5c3
tree: 5f26191a916640adf81cf12e406ad833c2c7acc7
  1. branches/
  2. MockFtpServer/
  3. tags/
  4. Android.bp
  5. MODULE_LICENSE_APACHE2
  6. NOTICE