am 7ee42771: Merge "resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp" into gingerbread-plus-aosp

* commit '7ee427714d4621bd9a0b15364a073aff60ebf20c':
  Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter.
tree: ed68a85d29dc6c8b8f72b947b778186e6f871579
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE