Fix build with 4.3's keystore

Change-Id: Ibd98a27b862b46da4ac4eb632486b34e7c39b72a
Merge remote-tracking branch 'cm/cm-10.2' into sm-jb-mr2