Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev am: 0081d76597
am: a2675bdfaf

Change-Id: I4e25daa1aaac3eed2339519db5166e0a19025a92