Instead of littering includes/ with stub back-compat aliases, house such classes in includes/compat/. Change-Id: I4c1b83e35c8d6c18777a4a3e17d81023915cfb7f