Merge "don't dex when installing an instant app" into oc-dev am: d5f3bd46a1
am: ec7cd6dbbe

Change-Id: I70a7876ea219ab9e8503be9dcb4ff7349a3941eb