Merge "DO NOT MERGE: Updating SupportLib version to 25.3.1 and extVersion to 47" into nyc-support-25.3-dev
am: 6464d13103  -s ours

Change-Id: I031d45935ec273caa0c62af8b9333d68a6c7cf70