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