Merge commit 'f45b6cbe' into gingerbread-plus-aosp * commit 'f45b6cbe': Be explicit about both uniprocessor and SMP when calling dexopt.