revert to core_android subproject naming