Update utility classes from AOKP