remove aosp targets and add my own