Defconfigs: Clean up and make compatible AOSP configs

Change-Id: Icdbc8e31b3a20c84148a05b243d03bf04926d0c1
Signed-off-by: dr87 <nb00870@gmail.com>