am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb

* commit '2b3da7ab61ac920881f35bbf66234c073d79ba24':
  MTP: Fix race conditions in MtpServer JNI code