Update defconfigs using make *_defconfig and using merge_defconfigs with the android base and recommended cfgs

Change-Id: Id1e8919259bfd9fe13b3c7ddcae1734fae9768f8