Build break introduced by mismatch from merges. Bug: 28251566 (cherry picked from commit a472e4fd) Test: m test-art-host Change-Id: I83a333dd7394af630c5a79153d4838eb3a910714