Merge "Update versions for O/v26 support lib. am: 5a219781ce am: 4d0725af9a am: 5f00600a0c" into oc-mr1-dev-plus-aosp
am: 7f15782a86

Change-Id: I0632ff4e9fdcd0f95a92b3ffdaed71f536fad043