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

Change-Id: Ica5b09a9e701e778cf7734d1e726af632dd9753f