am 1086fc9d: am 6157d599: Merge "Android: Remove superfluous OpenSSL include paths."

* commit '1086fc9d033f93ab02e2100ec171fa3de3a6f819':
  Android: Remove superfluous OpenSSL include paths.