am 96c44cc0: am 8308e03f: am dd5d1fdd: am b183c181: am 1cbf17f7: (-s ours) am ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev

* commit '96c44cc075ea3f04e799d6959e2b33824772576f':
  Get filename from File faster [DO NOT MERGE]