Revert "Remove resource overlays"
am: deb26ad395

Change-Id: I210009073d757f683f466d891c54ee8d055096dc