Revert galaxys2-common

Change-Id: Icdb6033f736e93e8249c3e63bdaa149e8cc5f191