Merge "Move non-updatable-api/ to core/api/"