Remove a leftover #endif from merge..

Change-Id: I07708925fbf850a8fc745fabfb1f3ea0df1d303d