Merge "Add DynamicAndroidClient" am: fa240e8054
am: 3699ba8e9f

Change-Id: I490f16ea9e123f6828d2e4d31e53fb9471a17f6f