am 5383d4a1: Reconcile with jb-release nakasi-factoryrom-release

* commit '5383d4a1f34e3160f932888d2187d0a384a6243b':
  Revert ""Rollback" mimetype cache"