Merge "Add master and lollipop OS X environment details"