Added extraAVDFiles parameter to support custom system images