Move res-common files to res where destination file doesn't exist
am: 44e39122aa

Change-Id: I1a7e480be3c5734ddf0c6a2cf67fa402c32bab46