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

Change-Id: Ia27a62acce14f8dbce07ceef942f0059ed8875cc