Merge "Revert "Revert "Revert "Revert "JIT root tables."""""
am: dac7ad17c7

Change-Id: Ie713d994800586937fb5fa09b1e21610bf3c3a47