Merge "Otapreopt: Add path for patching boot image" into nyc-dev