Merge "Add default_dev_cert to android_app_import" am: a436b1ae am: 01dee1d9 am: 0b4ddba4 am: 465868c1 am: 838255f8 Change-Id: Ibcf851a25d737d104fd078fb61a58bb858e3d7b0