Merge changes I150dc5fe,I72d327c2,I6c5a97dc

* changes:
  Remove include/private/android_filesystem_capability.h
  Remove include/private/canned_fs_config.h
  Remove include/private/fs_config.h