Android O Preview Release 1 (OPP1.170223.013)
Merge "Update junit reference"
am: d07f6d4ce6

Change-Id: I3aafb096692c16de1b672901e04cb50edcfa8458