Merge "Start deprecating OVERRIDE_BUILT_MODULE_PATH"
am: 34b3a41217

Change-Id: I56c9044adf5fbfcc672ec69b4f071f5b5822be8f