am 56eb0bfe: am 78114220: Merge "Define DEFFILEMODE and friends"

* commit '56eb0bfedb5747407f1db5145f571695450c178d':
  Define DEFFILEMODE and friends