Merge "system_server: remove old dalvik JIT rules on user/userdebug builds"