Bug: 130182551 Test: build and CtsDeqpTestCases Change-Id: If8b7e59879c9eaf1ee453cb43f2d4a7f06bf0ac9 (cherry picked from commit ee7a9ca8)