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