am cc253de1: am 280ebdf2: Merge "Fix image_test for SMALL_ART" into klp-dev

* commit 'cc253de1fe2a82b6d5cf22e62fc6797dae2222d4':
  Fix image_test for SMALL_ART