Merge "include oem.prop files in otatools_package"