Merge "Otapreopt: Remove patchoat step"
am: ac78d63733

Change-Id: Ia975a7b0948cd872f98eb367f9de4e1000730bd0