Android N MR2 Preview 2
Merge "Fix not properly handled NULL-pointer access before check in aac lib"