Merge "Revert "Add -Wno-error=maybe-uninitialized to bdroid_CFLAGS""