Merge "apexd: Create top-level /data/apex folders at boot"
am: 4fdc2ce2bb

Change-Id: I7ad1aaf6ffe09f5124c0d749bd90b58f6d1d47ce