Merge "Update art references to prebuilts."
am: b5303e5cad

Change-Id: I4cc6e807adaaffb2a64224552d84308377cf12f5