Fix appcompat-test build am: 0f3f71c172
am: c819ab7425

* commit 'c819ab7425867795a0c747a8cbecdeda2a2cc9b7':
  Fix appcompat-test build