Use Java 8's Optional instead of Guava's

Change-Id: I777ff6b07f89497bfdddda16e075652a92e12685
7 files changed