Merge "Mark product apks as unbundled" am: 856ef55672
am: 716111d81c

Change-Id: I242bbc9c151a4a8751d852fed34ec021675aad1b