Reorder extensions in an attempt to avoid dependency errors.

Change-Id: I6b21d0a5cddc2b275bd872911f096d9c0329dcc2