This reverts commit f9d41c1d. Reason for revert: Fixed issue of missing target skip. Test: mma -j40 test-art-host Change-Id: Ibe632e1f3063373950fb873e1716d0439c561297