Merge "Remove checked in mkstubs .idea directory"