Merge commit '15feb4defc61c7bded6fdd3ea1c3781f25666275' into kraken * commit '15feb4defc61c7bded6fdd3ea1c3781f25666275': Remove code to pass the nonexistant lockprofsample flag to Dalvik.
Merge commit '15feb4defc61c7bded6fdd3ea1c3781f25666275' into kraken * commit '15feb4defc61c7bded6fdd3ea1c3781f25666275': Remove code to pass the nonexistant lockprofsample flag to Dalvik.