Merge "Add bp-based disting of android stubs"