Moved android_system_core upstream