Return Hammerhead to AOSP