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