Merge "Add the dist path of android stubs files"