Merge commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0' into gingerbread-plus-aosp * commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0': Failure to move .dex in eng builds is not fatal
Merge commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0' into gingerbread-plus-aosp * commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0': Failure to move .dex in eng builds is not fatal