Merge 0c0496235c6b78bc11bfc630a2b3259e9ed23434 on remote branch

Change-Id: I0bf4204805cecd8f61709bbc400bbcfc5d83b02b
tree: d6203c30f08d77b1c5ea1f0902b199afe198a04c
  1. src/
  2. Android.bp
  3. CleanSpec.mk
  4. METADATA
  5. MODULE_LICENSE_APACHE2
  6. NOTICE
  7. OWNERS
  8. PREUPLOAD.cfg