Merge commit '2e3ec716' into gingerbread-plus-aosp * commit '2e3ec716': Fix class loader interning following a String.intern.