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
tree: b0e3b03f4c7a311ec7a5747da70b7071815c68fb
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE