Merge commit '3a3f5d65' into dalvik-dev * commit '3a3f5d65': Fix class loader interning following a String.intern.