Merge "Add a new PRODUCT variable for forcing 'speed' preopt." into oc-dev