system_core: Fix merge

Change-Id: I1ffbabe329b84b8324e368ecc373d0e394d8b36f
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
Merge remote-tracking branch 'cm/kitkat' into kitkat