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