Update test expectations for CHA tests flaking on no-dex2oat. bug:36344221 This reverts commit 27ef25f0. Change-Id: Ie92adc7a2ec3b3081a1c57d71f8c89247e58cd46