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

Change-Id: I356c634129ecb986c91a602a07672b55d6f9ee6f