Reconcile APValue.h

If fails will likely need to revert to AOSP

Change-Id: I262a1b2b5ce8f63d157ce75e1581b74da97d4e06