Update to use certain sources that is more AOSP-ified

Update to use certain sources that is more AOSP-ified