am 022a6c54: am f96c7bd4: Merge "Libutils: Comment out unused constants"

* commit '022a6c54b405ca517740e33d75b7c3514e2d384e':
  Libutils: Comment out unused constants