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

Change-Id: I27dcc7cd5fca29fea557cb6d681ccfa570b84cb8