Merge "Revert "JIT root tables.""
am: 20c56a8cde

Change-Id: I94678ba4ca22e9dc051ee83a40964c5b0d97f607