Merge "VINTF CM: changes from 4 into current." into qt-dev-plus-aosp