bottleservice: Handle commented-out TARGET_KERNEL_SOURCE lines

Change-Id: I547440883315647a84f82474f24939d15c95a8c7
bottleservice: clean up some echos

Change-Id: Ic92e0fa705009f098ac86e9cb2d231f2001afd0d
Merge remote-tracking branch 'upstream/jb43' into jb43x