am b3973efb: am f0917e0e: Merge "ART: Some header cleaning around bit-utils"

* commit 'b3973efb14c9a2c6df95d3e2a288a69fb84d8c08':
  ART: Some header cleaning around bit-utils