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

Change-Id: I442be6f22989c85639710d591d0f03ad06da29df