Merge "Ensure libopenjdk{,jvm,jvmti}d gets built with build-art target"