Merge "Move profile logic to dex_preopt_odex_install" am: b05880e311
am: bc8f7d7f52

Change-Id: I2689b17e798393409ccbd514cce201df1a8c4c68