Merge 19b399a4f2e31570320fee0e68f869e959430cd3 on remote branch

Change-Id: Ida7b12197a7cb658d637b643cd84e2b48f33bbd8
tree: 6459a22cdf76a6e5325f21d9073c2b40f70575bd
  1. src/
  2. Android.bp
  3. CleanSpec.mk