Merge "Build SF executable with USE_HWC2 when needed" into nyc-mr1-dev