Merge "Microdroid: Allow apexd again to access block device information"