Merge "Start deprecating OVERRIDE_BUILT_MODULE_PATH" am: 34b3a41217
am: 39eaf668d2

Change-Id: I5f9aeab46d8789c465edb44f9f2d03c391cdb69c