Android CTS 5.1 Release 22 (4181931)
Merge "Change package name of multi-dex instrumentation lib." into lmp-dev