Merge "Remove our copy of the f_mtp.h kernel header, now that it is in bionic."