Merge "Add hook for JVMTI agent in system server"