Replace deprecated assembly op code. am: 64a408d87a
am: 810e4d70c4

Change-Id: If834d6a8d918cebba9c32ad0824604ad476ababa