track build, system core and native
Merge commit '5955d34' into kitkat