Merge "Preload android.test.base to improve startup performance" am: 1bfeeeb8a1

Change-Id: I9338dd1346d4fd73675b795719f91b1e4db18ae6