Android CTS 5.1 Release 23 (4259358)
Merge "Add new build rules for target libraries."