Merge "Remove redundant entries from genfs_contexts." am: 720841c3ce
am: d54c256cf1

Change-Id: I6b1582415fbe636c1f33ce2ee5b52a9d3637d243