AOSP build fix

Change-Id: I5b62be03a18cfe3b8980f30dbdd69504f54e9ea9