[automerger skipped] Merge "Add DynamicAndroidClient" am: fa240e8054 am: 3699ba8e9f
am: 4ddcd60b84 -s ours
am skip reason: change_id I1ea5e861ecaca1647b445eac57ed15a144be68e8 with SHA1 c570b0c5a9 is in history

Change-Id: Id2fcfcf9520fbb23e16928dbbff0e3cd2c065701