Merge branch 'android-3.18' into android-goldfish-3.18

bc94b7ace0d9 Merge 3.18.81 into android-3.18
37cdf969145f Linux 3.18.81
76bb85f25229 x86/oprofile/ppro: Do not use __this_cpu*() in preemptible context
...
7238612a72e1 USB: serial: metro-usb: add MS7820 device id
7c1c88e160ed USB: core: fix out-of-bounds access bug in usb_get_bos_descriptor()
d9fbd49c6dfa USB: devio: Revert "USB: devio: Don't corrupt user memory"

Change-Id: If6865085c8a2b1660297ca574c79b35f00cec4a2