Update to 2.5

Updated using ./update_source.sh 2.5

Bug: 32912773
Test: Does not build yet; see following commit
Change-Id: I88f6252c2b17ea6c69255e7a607678fc9fa541a5
107 files changed