[automerger skipped] Mark ab/7061308 as merged in stage. am: d2c739581c -s ours am: 376847778e -s ours

am skip reason: Change-Id Ic1eeeba9894af2b3e13f1e841e28f0112b13283f with SHA-1 51ad0c0dde is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25b522cae435b3d12bb767aeeba44c26fb65a1d9
tree: 8ce9c56dcc6956cc9cc56c85e26e656c335bf62c
  1. src/
  2. Android.bp
  3. CleanSpec.mk