Fix issues caught by Android Lint am: d0d5415ff4 am: fa32132f9a

Original change: https://android-review.googlesource.com/c/platform/external/androidplot/+/1346923

Change-Id: I4fdf14d888e532bfe12ffbb848fb37348bb0a433