Merge "Merge "Abort connecting to native daemon during shutdown" am: d763e341b5" into stage-aosp-master am: f0da6c03bc am: c3c4007a10
am: e3c2b594af

Change-Id: I781818479685c89647378197432ff744c1c75971