am 8f1dd6fd: am 10cf121f: Merge "Update make file" into jb-dev

* commit '8f1dd6fdc2f788492e5ca77344eac13755c304ff':
  Update make file