remove aosp stuff

Change-Id: I16a357147f9a455e1e79e844eed9a3911e52a4fa