Bug: 67754178 Test: m -j32 checkbuild && USE_D8=true m -j32 checkbuild Change-Id: If63afc10ceb5e753bbb7f195bb8a895eaef10775