Bug: 147508315 Test: manual (lunch coral-userdebug && make -j100) Change-Id: I3ee78e52a93c94e8e8746eea83890de889cb452b