Bug: b/74026074 Fails 551-checker-shifter-operand on target. This reverts commit 81a1f853. Change-Id: If3094f73744bbb5f9ab1df4509f757df24af0047