am 84333fb3: am 8b1a929b: Merge "Remove some unused cutils/properties.h references"

* commit '84333fb3df210904d43b3a7980740970dd044051':
  Remove some unused cutils/properties.h references