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

Change-Id: Ib3908cf00f86e9eda2bbcd40091f6942772ad8ef