Merge "media/mtp: Add missing LOCAL_C_INCLUDES"