Merge "Move android.jar defaults back to f/b"