Android CTS 5.1 release 7
Merge "Change package name of multi-dex instrumentation lib." into lmp-dev