Fix common resource build

Change-Id: Ief99b32cbd0746a926df27797241a3fcf213aaf5