Merge "Add a new PRODUCT variable for forcing 'speed' preopt." am: 8c2c1ed667
am: eec5747912

Change-Id: Iee5490ea2b74137612238282115478b148aed55e