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

Change-Id: I2cdd765dc1a3de9a6c29693d8ba219042a351bd0
tree: 7869361c499873f77e5ad6774b927b1b213ddc9c
  1. Android.mk
  2. include_framework_res.mk
  3. MODULE_LICENSE_MIT
  4. NOTICE