Merge "defconfig: Enable bridging and ebtables"