HWC2: Hook up to BoardConfig variable am: f9d7e1a0aa
am: 2c0d316056

Change-Id: I5981d25805a7c6d32a24a57f0d9c3916a6ceeedf