Merge remote-tracking branch 'aosp/upstream-android_layers'

Merge in gradle build for validation layers