Android O MR1 Preview 2 (OPP6.171019.012)
Merge "Add OWNERS in external/aac" am: db59691026 am: 6f8a59ff40
am: e10e3d33cf

Change-Id: I3b51a11cc119ebc35aab051c21133a1476db5a0a