Bug: 65857238 Test: m test-art-host (cherry picked from commit d4215bba) Change-Id: I526ce24cb9d476303d36ac106532b544aa455d11