Merge "AAC encoder: handle missing object types" into klp-dev