Merge "Updating all makefiles." into oc-dr1-dev-plus-aosp
am: f901ba801f  -s ours

Change-Id: I9fd078d5e7d5b0e93ee9d11e4331179f2bc07656