bottleservice: Handle kernel default remote+branch more intelligently.

Change-Id: Ieeed486f65324d76579a0e2fb2ab967b3f15a4f5
re-aosp a bunch of things

Change-Id: Ibccb8d1a0f5f7f6d79160463a489a70dc8f9f334