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

Change-Id: I80c4c3c8933e1fca9d505e4d8e12d2a9cddf4092