Merge 'Frameworks/base: Second Clock (1/2)' int kitkat