Merge "Ensure libopenjdk{,jvm,jvmti}d gets built with build-art target" am: 90eb05c4f3
am: e425ca2fbd

Change-Id: I76b317c074c9473c03d560a8fd214dab8a986147