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

Change-Id: Iad4328b97d3806353cca58f94dfb38e91722041e