Merge "Merge "Abort connecting to native daemon during shutdown" am: d763e341" into stage-aosp-master