Merge "Remove unneeded bootimage properties"