Merge "[ART] Make killing logd more safe"
am: cf0c0658f1

Change-Id: Ic0215e7ac3db72bf2da2052d8c0200a2ca75b565