Use Aviator in Module Resources

Change-Id: I955b16f04e8e1207dc38198f375c7592a0dba4e3