Merge "Docs: Adding master and lollipop OS X environment details"