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

Change-Id: I1a3033ea31e1933c0b3b069b69007b34baff5364