Fix build

Change-Id: I693d45f4ee0be2b8cf989b5f881d3e88be895f31
Disable changelog for now (repos other than aospa cause conflicts)

Change-Id: I014f30f870ad8711e5a63a88c96a37420d3697a2