Merge "@hide MediaStore.ACTION_MTP_SESSION_END" into honeycomb