Merge branch 'security-aosp-pi-release' into int/p/fp2

* security-aosp-pi-release:
  libbinder: uptimeMillis returns int64_t!

Change-Id: I3909aa4602eb0c50d9d769c3bfa191e8d6707a04