[automerger skipped] aacenc: handle input size not aligned at sample boundary am: 1f5583ef37 am: c48e0ae6ba
am: 89f3994620 -s ours
am skip reason: change_id Ife09efcedf573d4327e8482e03dd82fcafdb5eb2 with SHA1 3dd7bd3440 is in history

Change-Id: I9b09b0312fba383ca9b6e5387e1a85ef0c6c4d12