Merge "Add vendor version for libgui" into android-15