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

Change-Id: Ie12dc696d3197d472cc9b0e38b3581b057eaf424