Merge "Failure to move .dex in eng builds is not fatal" into gingerbread