am 24dd4cd7: (-s ours) am b0344cf0: Merge "Supporting path specified by build_tools.sh" into studio-1.4-dev automerge: 6664a90 automerge: 5ffab62

* commit '24dd4cd7d7c527651d1632c2eb08b433bfa34c45':