AOSP build fix

Change-Id: I1651c56ce2d958db7fbd0c983e6010a73ccf73dc