am 0b28b9c2: Merge "Revert "Store inodes in unsigned long long""

* commit '0b28b9c28f2a93526531dec99541920002f4beb6':
  Revert "Store inodes in unsigned long long"