[TIMOB-14978] Fixed Android detection lib to support AVD issues.