Merge "USB: android: strim serial number buffer" into msm-3.4