Merge "Remove make-based disting of android stubs" into rvc-dev-plus-aosp