resolve merge conflicts of ef6d09c to master

Change-Id: I211040052cdf230221f3f0ba6f25b063c636b77e
tree: 5cb76874115ee07ae1fe44df88778548e3f906d4
  1. include/
  2. src/
  3. utils/
  4. Android.bp
  5. MODULE_LICENSE_PUBLIC_DOMAIN
  6. NOTICE
  7. README.android