system_core//change to aojp

Change-Id: I931589991a0ca03f47bc4dd556cfb330a0c0a8d3