Merge "Remove microdroid specific rules and files"