am bf7a4eba: am 16011283: am 316ec9ef: Merge "Update make file for new driver loading."

* commit 'bf7a4eba283636a4a34ebf088ec70861c1b6467f':