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

Change-Id: I26823845befc1b01b5e695e23728626dc243d832