Merge "Create /data/system/heapdump for system_server"