Merge "Add bp-based disting of android stubs" into rvc-dev-plus-aosp