Merge "Conditionalize LocAccessToEvent on Android target build."
am: a128781f9e

Change-Id: I22abca51df593b316d05c089d0b79a1c66b1b278