Merge "edk2: Fix compilation errors on latest Android"