Merge "Fix failure to install prereq apks on fugu/arm." into lmp-dev