Merge "Revert "Revert "JIT root tables."""
am: 4b050e817b

Change-Id: I58d029103296071d91fcf5d1a5d969095aab925c