Android
Android, Changed AES Lib
Android,AES Bugfixes
updated keymanager
keymananger
keymanager
merge