am 5039dec7: am 3cac204d: Merge remote-tracking branch \'goog/jb-dev-mako\' into jb-mr1-dev

* commit '5039dec7':
  bluetooth: add property permission for bluetooth
  Export flags needed for ifc_reset_connections API in netutils
  remove an anonymous typedef
  HACK: push ramdisk up by 2M
  HACK: use /firmware/image as a 3rd choice
  libnl_2: compile as shared library as well