Revert to AOKP system/core

Change-Id: Ia9827e8ffe4ee050cff66c9096734acc1fb85bf4