Merge "Enable profiling for system server for userdebug|eng" into oc-dev