*UPSTREAM: *pico-imx6ul: Merge defconfig in android config

Merge defconfig from picosom-imx6ul_defconfig to
imx_v7_android_defconfig.

Signed-off-by: Haoran Wang <Haoran.Wang@freescale.com>
Change-Id: Id854daed68f03646909b06094314ad8bfdfa3712
1 file changed