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

Change-Id: If2475366958f37e11efc601898e3cb41399b6fb9