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