Merge "Final push of installd to Binder; goodbye socket!"
am: 24865a0868

Change-Id: Iead84e70b56b40c49a0b358915bf5daa4df77882