Merge "Final push of installd to Binder; goodbye socket!"
am: 1950377f91

Change-Id: If10d4f4aafa68b78ddd9a98e8699fe008bbda49b