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

Change-Id: I90c49818286689f495ab71ea25af81e8f8d3d173
tree: d00c6979e0e1472b55b1dc5f16e15539c05a6c5c
  1. files/
  2. google/
  3. wfa_certs/
  4. Android.mk
  5. README.cacerts