Adapt change clearkey to Lazy hal am: 0a50473369
am: 588b4ead25

Change-Id: If3da3dca05ccb1c42a0570e39d2e792a04729a97