Merge "Add DynamicAndroidClient"