Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev