Apply "GT-I8190_JB_Opensource_Update2 (conflicting files)

from http://opensource.samsung.com/reception/receptionSub.do?method=search&searchValue=I8190