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