Merge "Fix 2579461 Disable move when manifest option for install location is unspecified and install location is auto/internal" into froyo