Merge "Add shmem config buffer to libvrflinger"