Build SF executable with USE_HWC2 when needed am: f9f7f6931f
am: 58719ff766

Change-Id: I559a674184a0a08829b49dd90d85e75478385021