Merge changes from topic 'fsconfig-2'

* changes:
  fs_config: add comment to header
  android_ids: move to bionic