Clean up for building with aokp

Change-Id: Iabb2115697e31586eee202d985df3b974dfa481e