Merge "installd: add dependencies required by apexd" am: 734bd2137f am: 260882bbdb am: 878a83cf8b
am: 822f9c137c

Change-Id: I3900a25b1505b60deb48bd05c66305f4c721500c