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

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