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

Change-Id: I59491078b65f4df90d0066adcc825f2303ee32e2