Build update for AOXP

Change-Id: I79ac3de9a974de3c033681efbf5782a3ea1571ef
Signed-off-by: sarcastillo <sar.castillo@gmail.com>