Update ChangeLog

Rebasing to AOSPA as AOSCPA