Merge commit '19275cb5b028c18228674f87ba4cbc98d8520c5e' into froyo-plus-aosp * commit '19275cb5b028c18228674f87ba4cbc98d8520c5e': Remove code to pass the nonexistant lockprofsample flag to Dalvik.
Merge commit '19275cb5b028c18228674f87ba4cbc98d8520c5e' into froyo-plus-aosp * commit '19275cb5b028c18228674f87ba4cbc98d8520c5e': Remove code to pass the nonexistant lockprofsample flag to Dalvik.