Merge remote-tracking branch 'aosp/upstream-master' into HEAD

Initial merge of kmod v24.