Merge c1daa6a9165da0ecad2a5f6df5ada1acf656908f on remote branch

Change-Id: Ica36d070bff302e81d9a395b9065c93021b2db18
tree: c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41
  1. src/
  2. Android.bp
  3. CleanSpec.mk