Rebase system_core from OmniRom

Change-Id: I2d8cd7b38fc1a26534cd47c4a5cbb62dd9455fca