Fix automerger mistakes committed during aosp->master merge

Fixes: 130202368
Test: treehugger
Change-Id: I728aacf6fa892db942bc26a1486d1f01aa0b1433
12 files changed