Revert "Update franco_defconfig to r22"

This reverts commit 8f2b6c73eb5d7bd40204886437368daa36c98d5f.

franciscofranco reverted this in r23.