Update SDK build for recently-added support library modules

Bug: 35707648
Test: make sdk
Change-Id: I6b5991b0544492ec2db8b66ab7eb7c17af8ba882
2 files changed