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

* commit '8b1a929ba6461b83f9150090ee807c0274bd5ac5':
  Remove some unused cutils/properties.h references