[automerger skipped] Convert support library to Android.bp am: 70ce9762f3  -s ours
am: e1766193b7  -s ours

Change-Id: I1f4de9938238eaafb3266646325618239c862c3e