am 391ef42c: am 3168a137: Merge "Fix surface frame size reporting." into honeycomb

* commit '391ef42c92ab97e5c22a720973790696d30576ca':
  Fix surface frame size reporting.