[automerger skipped] DO NOT MERGE Fix build breakage

am: 634fd70147  -s ours

Change-Id: Id90d30142b308e81a0c6ce882c972a36a14e504f
This commit is contained in:
Hall Liu
2018-12-04 14:46:07 -08:00
committed by android-build-merger

Diff Content Not Available