Move build to aosp-s4 manifest