Merge "Start deprecating OVERRIDE_BUILT_MODULE_PATH" into oc-dev-plus-aosp
am: 87f0e524ca

Change-Id: I6722623346d1c6c47d9fb7c2730eff89077d9d5e