Merge "Clean up app image .bss dex cache arrays fixup."
am: ac2efad144

Change-Id: I1171c8c2dae22d6ee888b16c5f8425a875c6fa28