Merge "Make sure all HWC2 functionality is ifdef'd" into oc-dev am: f0f8a81d06
am: 65c45092a0

Change-Id: Iad71df535591c43fcf4f59607787adcb0aa9c7ca