Merge "Build target which faciliates ART testing image/image creation"
am: 413293ebfb

Change-Id: I2d4784b0180af36f209106946118c76779fda8fc