Merge "Fix INCLUDES path for keystore headers."