Merge changes Ifa0a68f1,I1f7d2260,Ie5d9cc57

* changes:
  ART: Fix inefficent find/rfind
  ART: Avoid implicit conversion warning
  ART: Fix macro parentheses warnings