configs : Enable stuff + fix derps

* Enable rwsmem
* Enable optimished AES and SHA1 routines
* Fix up mismerge

Change-Id: I14cbc1d7ac514f331806631b074446873a9a21e8