HWC2: Don\\'t set null handle for client layers am: e24da966b1
am: 7920c657c6

Change-Id: I2cf2057d23a7c9d58acf6b025513c69a472c3192