OTA Dexopt: Remove old '&' path am: c260c96b5c am: 188615ead6
am: b030bf0f94

Change-Id: I01dbe9f3500222bb155de0fbb97413faf75e2092