Renamed android_core -> android_system