remove junk and fixup aosp building

Change-Id: Ic875aec5267f4e59aaafc32bd598614953e1e4b4