Merge "Remove unused constants for encrypted OBBs"