Sync defconfigs.

Change-Id: I0f1f836fee3d3b5894a26496f8e725368735f13c
2 files changed