[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: ea2fd1fde2  -s ours am: fafc717d05  -s ours
am: 5d2e2e3044  -s ours

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