Merge stage-aosp-master into pi-dev-plus-aosp
am: c9dbef9150

Change-Id: I9be366c1862160b304d5be0eafc2ae00d6e64957
tree: e92fc97557a41e588b5cea6e8c4a3552e2835bcf
  1. Android.mk
  2. include_framework_res.mk
  3. MODULE_LICENSE_MIT
  4. NOTICE
  5. OWNERS