Merge "USB: android: Add a new LUN as CD-ROM in mass-storage" into msm-3.4