Merge change 645

* changes:
  Allow ViewStub to be used in AdapterView.setEmptyView() (bug 1803058)