Android o preview 4
Merge "Refactor module registration"