Revert "82393: Fix template instantiation in ADT"

This reverts commit d7d481fa.

Rather than attempting to teach ADT to understand the new template
formats, just continue to use the pre-24 templates instead
(see https://android-review.googlesource.com/#/c/119386/ )
(cherry picked from commit c55e6265)

Change-Id: If7f6a4ae219581871cd979ae1aeeaf0d49ab7cce