Merge "Add openssl to TINY_ANDROID build" into jb-mr1-dev