am 0c4ec0da: Fix build for aosp_manta

* commit '0c4ec0dae97523cadc9207e98c4a1edff7e2e7cf':
  Fix build for aosp_manta