mergeup: update with envsetup and repo sync

Change-Id: Ia850cef22aae92b49cc1605c84c84ed5d342ba44