Inline res_state_ext into res_state

There was just one field left, so inline it into its parent and remove
this horror show entirely.

Test: m, flash, atest
Change-Id: I1f3e38d2dc335bfaf58b0d59c9dcb6f52ca91210