Merge "Add missing style change to android_mtp_MtpDevice.cpp."