Merge "Fix not properly handled NULL-pointer access before check in aac lib" am: b0af861f5a
am: b0f6b2906e

Change-Id: I06232a0b0126349e7d4cffff0d9c1eac90eddbb2