Merge "Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry."
am: c160675a93

Change-Id: Ic8e6d589d3a6bbc630202356d85851ed5729e22c