Revert "Extend extension support"

Bug: 37785708

This reverts commit 9933c1cf931c88c9220cc8e4c12fe5d05eb1d940.

Change-Id: Ic96e178835f5a9bbd2416f0e573975c60172388c
10 files changed