Merge "Add feature flag for Dynamic Android" am: c1e55147c9
am: 3e51385d47

Change-Id: I2372a014bfe359dd84d43c0ddff8c662ce8684fd