Merge "Add deprecated header f_mtp.h to mtp code." am: ade6032e11 am: 292c88a4f5 am: 58996804e0

Change-Id: Iac9bfe361be16bc9f77d1061ec848c0dca99345e