core/res: resolve merge cruft

related to: https://github.com/AOSPA-legacy/android_frameworks_base/commit/359efbc589a3656866f4c2517a666428b7e6aa71

Change-Id: Ic992a9ef286d40ee26c6ae9db2428eb6c00d010f