defconfig: merge android L