Use shared defconfig and variant defconfig for command line change

Change-Id: Ic30099ff4ab7b69905947cef42124f979bc78ee0