Merge "Add system image UI tests for API 33." into emu-master-dev