Build fix.

bug:21762834
Change-Id: I47753655f6f9ae03ac63bb39bef419092a9c5fff
13 files changed