am bfd0e517: am c0668a82: am b4b8a4bb: Fix support library gradle build

* commit 'bfd0e5178111f5ccc9a934d37c7027119d87e423':