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

Change-Id: I3bc9c86d4a2398b7f1dfaa7ff51fb66e156f1f84