Android p preview 2
Merge "Update robolectric references to android.jar."