Merge "Fix VtsHalDrmV1_0Target test failure" into oc-dev am: 1fd47b29b3
am: e126cf8cc1

Change-Id: I47ee7ecc392a88e0f4ac3ea570e5a55947be9f09