Merge "NuPlayerDrm: explicitly use 32-bit subsample sizes"