tree 95953cac7132ab73dc97019a66d6197c19fc8606
parent 4d4554fe25550d189a124518de84b0874e4937aa
author Amit Mahajan <amitmahajan@google.com> 1574291622 -0800
committer Amit Mahajan <amitmahajan@google.com> 1574461656 -0800

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

Preparatory CL for upcoming shared lib change.

Test: basic sanity
Bug: 144806641
Merged-in: I8f81195b72c6329844a450ce28d76f949f41e2d8
Change-Id: I8f81195b72c6329844a450ce28d76f949f41e2d8
(cherry picked from commit 28a499cd7154e1aba7eaa8bd592c143e56e118c1)