Merge pie-platform-release to aosp-master - DO NOT MERGE

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