Fix miscellaneous jshint issues

Bug: 47161
Change-Id: I09e14d70ccea4d228b9bce274d89bc7fe9a3bce4
Merge "Fix miscellaneous jshint issues"