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

Change-Id: Ia0b64553a161a71dc4feeb57411ab50b5e26c9f9