Revert "lets try AOSP now"

This reverts commit 874f7fac2bb454ceacc8fdb7987b03e906d05723.