Merge "Remove references to nonexistant @android:string/ellipsis." into mnc-dev