[ Merge of http://go/wvgerrit/23533 ] Prior to this CL libcdm_protos was included as LOCAL_WHOLE_STATIC_LIBRARIES b/34393411 Test: Ran unittests and streaming/offline playback using playmovies. Change-Id: I4cdea8620693ee7660c71e44d08122acd07843a2