Android 4.1.1 release 6
Merge "Update to r17 of LittleMock."