am c3606508: am 0bdafb19: Merge "add circle brush" into gb-ub-photos-carlsbad

* commit 'c3606508cecf94cfde3f1a927ab926f414b83ac0':
  add circle brush