HWC2: Hook up to BoardConfig variable am: 8beb15f220
am: 608852e318

Change-Id: I91252f79de7035b958329a68e4172edb5b2c302a