Merge "Add @NonNull / @Nullable annotations to android.mtp API."