Merge "Compile libext2_blkid and libext2_uuid on Mac OS X for the Cuttlefish launcher"