Merge changes Ia8a15db8,I20ac5203

* changes:
  Don't enable hardware acceleration when the app owns the surface. Bug #3323096
  Make FrameLayout support mixed wrap_content/match_parent children. Bug #3259668