am 8191944f: am 0a70ed99: Merge "Fix surfaceflinger tests."

* commit '8191944fd2828ea3b848fcf378a39f146af7f38c':
  Fix surfaceflinger tests.