Revert "Minor LoadedApk refactoring."

This reverts commit 7541ca4d1aa48e3110187a83a8dccbfa72084148.

Change-Id: I2a6aa5038870c32c4145436f0463092c9b82dd23
Bug: 71501570
Test: manual
8 files changed