Merge "Clean up code for experiment of JIT'ing priv apps"