Merge "Fix classpath for AndroidLocale" into lmp-dev