Merge stage-aosp-master into pi-dev-plus-aosp

Bug: 126125118
Change-Id: I4b74b99391e34c16ad79b04881e8633ee4f9de5c
tree: 0ddeb963b202c7123605c65c7f0aa0cf249f4417
  1. Android.mk
  2. include_framework_res.mk
  3. MODULE_LICENSE_MIT
  4. NOTICE
  5. OWNERS