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