Merge "Enable instrumentation of system server on debuggable devices."