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

Change-Id: Iac3d09ba479035e547bdbed1bf35223e851c94f9