Merge "Remove unnecessary entries from microdroid vendor file_contexts"