Fix build.

Bug: 170697222
Fixed: 170697222
Merged-In: I02e0a07805d23b955069fad93b61b4476e5e364e
Change-Id: Ia9ec8bce7c950fe86811f84267ec00341fb84210
21 files changed