Merge commit 'd8b5f50d' into gingerbread-plus-aosp * commit 'd8b5f50d': Correct dexopt for uniprocessors.