Track AOSPA's system core 

I think there's no needed changes for the builds