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