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

Change-Id: I3c6b3c5cbf07239db5fc08e6645f0b456a72a1a7