[automerger skipped] Fix build more
am: d9d5f654c7  -s ours

Change-Id: Id7d1d5f358c21e010530c0158ba72f4ccb8c6bf9