am 1accd9e1: (-s ours) DO NOT MERGE: cherry-pick: Remove libaes from the build. Merge commit '1accd9e13f6ea85a7bc4991085f1cf21b7a36ec0' * commit '1accd9e13f6ea85a7bc4991085f1cf21b7a36ec0': DO NOT MERGE: cherry-pick: Remove libaes from the build.