Merge "Hardcode in dexopt the information that /system/product should be...
Merge "Hardcode in dexopt the information that /system/product should be /product." am: 7aa5a56b am: 4505b985
am: da4ff640
Change-Id: I6fb11feea6218d11f298ef5a6e678e4048e851f5