Merge "microdroid: Add support for extra apk files"