Track some externals from slim and aosp