Merge "Adjust basis against which enum performance is compared." into dalvik-dev