frameworks/native change to AOJP

Change-Id: Ifafe0edcbb293687b2d89f7f2ecda351e3077127