Android CTS 6.0 Release 13 (3530687)
Merge "Remove OpenSSL include paths."