Merge "Update LoadedApk instead of re-creating on outdated cache" into qt-dev
am: 1d66b0b0d0

Change-Id: Idc8dbb691c5f4f8ee2f3bdd3513fd3dbc56cc35d