Merge "Change package name of multi-dex instrumentation lib." into lmp-dev