Merge "Move support library dependency munging earlier"
am: 7e15b44c23

Change-Id: I9147989ec9226acff81f871461442b689dbfa65d