Merge "Deprecate android.util.Mutable*." am: 71a9e66d4a am: 708034e951
am: 6e6ce00b4c  -s ours

Change-Id: Id81f5613daa50ece98a37a1595853546cc3c2434