Merge "Remove external/openssl/include from verity include path." am: f286f3d5ce
am: 465a7c717e

Change-Id: Ic1c0a2a89e47d6c3ca4a1a662bab07a817785e7a