Merge "Start deprecating OVERRIDE_BUILT_MODULE_PATH" am: 34b3a41217 am: 39eaf668d2
am: 32df519a06  -s ours

Change-Id: I2319525beb1291bf9391b211f9779cc407b92fc4