Android O MR1 IOT Release 1.0.5 (5014699)
Merge changes from topic "upstreamz"

* changes:
  Update to latest FreeBSD upstream.
  Convert makefile to blueprint.