Merge "Add DynamicAndroidClient"
am: fa240e8054

Change-Id: I05b545489d9fb075a782ee942195011d79bbfbca