Clean up some resources and change switch-case to if-else block.

Preparatory CL for upcoming shared lib change.

Test: basic sanity
Bug: 144806641
Change-Id: I8f81195b72c6329844a450ce28d76f949f41e2d8
9 files changed