Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS"