Merge "Add back builds for libaaudio examples"