Merge "Add hook for JVMTI agent in system server"
am: 957ac164ef

Change-Id: I939ee4631cb7f1d0391a2fe007545086de24bef5