Android 5.1.1 release 34
Merge "Change package name of multi-dex instrumentation lib." into lmp-dev