Bug: 70191319
Test: $ lunch aosp_arm-userdebug; BOARD_VNDK_VERSION=current m -j
      $ emulator # boot to home screen

Change-Id: Id19a847072f2f0b55184c183647889c1a1b53aef
Reviewed-on: https://swiftshader-review.googlesource.com/14688Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>