Update android makefile to use bzrtp
Use bzrtp to generate keys for IM encryption
Merge branch 'dev_bzrtp' of git.linphone.org:ortp into dev_bzrtp
Add an index to the ZRTP cache for IM encryption