Android 7.1.2 Release 1 (N2G47D)
Switch to use the latest version of caliper
am: 511b3e3901

* commit '511b3e39019aecae203340bced277a7142bfde12':
  Switch to use the latest version of caliper