Merge "fs_config: error on multiple specifications of android_filesystem_config.h"