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

Change-Id: Iced9a0116c92633fb786013d6441c51aebb39a0d