Merge "aenc-aac: bounds checking"