Merge "Remove make-based disting of android stubs"