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

Android 4.3 release 2.1

Conflicts:
	src/com/android/providers/contacts/ContactsDatabaseHelper.java
	src/com/android/providers/contacts/aggregation/ContactAggregator.java

Change-Id: I91b2e99acf64242227a0b72a01d9dae5844a2c95
Fix build errors

Change-Id: I851dfb72a2e55503b1e5350ec0099fdb1637c3a4