Merge "Clean up UpdateOatFile for app images"