Merge "Update makefiles after AOSP push."