Merge "Removing some obsolete flags" into ub-launcher3-calgary
am: 7cb519bde1

* commit '7cb519bde14f33aff39350a1e4cbb17e87d53abc':
  Removing some obsolete flags

Change-Id: I45e28a1b9d06990f72f3f0b865b2497beb7fd82a