Switching to AOSP...Test build 1