Revert building with custom toolchain (use AOSP again)