Merge "Merge "Merge "Properly use versioned interfaces." am: 9572afce76 am: b92fbe0435" into qt-dev-plus-aosp am: 5b992330bb" into qt-r1-dev-plus-aosp
am: b010e1210b

Change-Id: Id816e44f87d644e2c8b0e41b860fac7fd4305fed