Merge "Updating all makefiles." into oc-dr1-dev-plus-aosp