Merge "ART: Add Size() to CollectionMap"
am: ac9fa1811e

Change-Id: Ic692904bbad0412b39da9a61b8ca394e4cc7c245