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

Change-Id: If9898216faf5a220963afbc9c036e2a1e8f69f7e