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