Clean up AOSP-related stuff

Change-Id: Ic29d677ddd4ac71d42215ef0deaefb8a4e685d88
9 files changed