Merge \\\"Build SF executable with USE_HWC2 when needed\\\" into nyc-mr1-dev am: 98650f0e33 am: 6929fb5ee3
am: 9030ab4316

Change-Id: I2d842402c2abd5abf350d8b0ad056940315f51a4