Fix AOSP build (DO NOT MERGE)

Change-Id: I55ff499773066ad8bcbf9dc136df72905a759416
1 file changed