am 0a70ed99: Merge "Fix surfaceflinger tests."

* commit '0a70ed998cad67bf1c82e82d4229291c9dcc22ac':
  Fix surfaceflinger tests.