Merge commit '87f66617' into gingerbread-plus-aosp * commit '87f66617': Add --uniprocessor option to dex-preopt.