Merge "Revert "Treat Microdroid as OS with monolithic sepolicy""