Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1
Fix build errors

Change-Id: Idbf585c237058e7e1a3095b201cfe56270c9c1be
Mms: Generic Blacklist support (3 of 5)

Change-Id: Ib809ea56de60b6eace785ffd69158b10c2c9ebbe