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

Change-Id: I678bb3273f427eb6ae86b3ae553d64e612ab04a4