Merge "Pass DEXOPT_INSTALL_WITH_DEX_METADATA_FILE for first boot" am: 0ea144f4bf
am: 8deca3f06f

Change-Id: Idefc228d35212f4014e9bb204e54b58c904ee94c