Merge "Export android_filesystem_config.h as a filegroup" am: 80112f73cd
am: b58d3b2900

Change-Id: I1bcd574a0010c2d16ae8755fbefc4fa5e1ae9325