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

Android 4.3 release 2.1
Merge remote-tracking branch 'cm/cm-10.2' into HEAD

Conflicts:
	keystore/keystore.cpp
	keystore/keystore_client.cpp

Change-Id: I61f52fc749010c05dd69569ff1796c523668dad6