Merge "Otapreopt: Remove patchoat step" am: ac78d63733
am: 3feb4b414d

Change-Id: I4a209f013b6f37ce0e39e3e87cb2f2c3495bec62