Changes to API

ControlTemplate and ControlAction serialize to Bundle. That way,
unserializing can always be done (maybe to UNKNOWN or NONE).

Also ControlState does not have a control anymore and now it just has
optional fields for overrides.

Test: atest

Change-Id: I1ce23c786a1b377d306e7785f9249b55b56d4c9f